nnimap.el (nnimap-request-set-mark): Remove left over.

nnimap.el (nnimap-get-groups): Allow non-quoted strings as mailbox names.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 132ff03fe4d6ad36a7043895c9cc04cf865d011d..5a2f767b2d8c17431586ed7adfef58c89185f69a 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-26  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * nnimap.el (nnimap-get-groups): Allow non-quoted strings as mailbox
+       names.
+
 2010-11-26  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * shr.el (shr-insert): Revert last change.

diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 307deba8afde24a55857117574307912eaba4115..cb4c9f0108ce663d02cb1491a404415d0d907f34 100644 (file)
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -928,7 +928,6 @@ textual parts.")
     flags))
 
 (deffoo nnimap-request-set-mark (group actions &optional server)
-  (debug)
   (when (nnimap-possibly-change-group group server)
     (let (sequence)
       (with-current-buffer (nnimap-buffer)
@@ -1029,7 +1028,10 @@ textual parts.")
            (separator (read (current-buffer)))
            (group (read (current-buffer))))
        (unless (member '%NoSelect flags)
-         (push group groups))))
+         (push (if (stringp group)
+                   group
+                 (format "%s" group))
+               groups))))
     (nreverse groups)))
 
 (deffoo nnimap-request-list (&optional server)